Refactor

.gitignore

@@ -6,3 +6,4 @@ riderModule.iml
 database.db
 database.db.bak
 .DS_Store
+.idea

.idea/.idea.AFRA/.idea/.gitignore

@@ -1,13 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Rider ignored files
-/modules.xml
-/contentModel.xml
-/.idea.AFRA.iml
-/projectSettingsUpdater.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/.idea.AFRA/.idea/dataSources.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="database.sqlite" uuid="54cc25a5-42fd-4301-9b2a-8623682d9322">
-      <driver-ref>sqlite.xerial</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:database.sqlite</jdbc-url>
-      <working-dir>$ProjectFileDir$</working-dir>
-    </data-source>
-  </component>
-</project>

.idea/.idea.AFRA/.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
-</project>

.idea/.idea.AFRA/.idea/indexLayout.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="UserContentModel">
-    <attachedFolders />
-    <explicitIncludes />
-    <explicitExcludes />
-  </component>
-</project>

.idea/.idea.AFRA/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-</project>

.idea/.idea.AFRA/.idea/sqldialects.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$/AFRA.Members/Migrations.cs" dialect="GenericSQL" />
-    <file url="PROJECT" dialect="SQLite" />
-  </component>
-</project>

.idea/.idea.AFRA/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

AFRA.Members.csproj

@@ -14,4 +14,10 @@
       <PackageReference Include="System.Data.SQLite.Core.osx.arm64" Version="1.0.117" />
     </ItemGroup>
 
+    <ItemGroup>
+      <None Remove=".gitignore" />
+      <None Remove="database.db" />
+      <None Remove="database.db.bak" />
+    </ItemGroup>
+
 </Project>

AFRA.Members.sln

@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AFRA.Members", "AFRA.Members\AFRA.Members.csproj", "{9C51539C-ADB7-4B5E-855D-EAB40F1F7B22}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AFRA.Members", "AFRA.Members.csproj", "{9C51539C-ADB7-4B5E-855D-EAB40F1F7B22}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

AFRA.Members/Pages/_ViewImports.cshtml

@@ -1,3 +0,0 @@
-@using AFRA.Members
-@namespace AFRA.Members.Pages
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

Backend/Migrations.cs

@@ -1,9 +1,9 @@
-using AFRA.Members.database;
-using AFRA.Members.database.Tables;
+using AFRA.Members.Backend.database;
+using AFRA.Members.Backend.database.Tables;
 using LinqToDB;
 using LinqToDB.Data;
 
-namespace AFRA.Members;
+namespace AFRA.Members.Backend;
 
 public static class Migrations {
 	private const int DbVer = 2;

Backend/Program.cs

@@ -1,5 +1,6 @@
 using AFRA.Members;
-using AFRA.Members.database;
+using AFRA.Members.Backend;
+using AFRA.Members.Backend.database;
 using LinqToDB;
 using LinqToDB.Data;
 

Backend/StringUtils.cs

@@ -1,8 +1,4 @@
-using System.Security.Cryptography;
-using System.Text;
-using System.Web;
-
-namespace AFRA.Members;
+namespace AFRA.Members.Backend;
 
 public static class StringExtensions {
 	public static string Delimit(this string input, int max) => input.PadRight(max, ' ')[..max].TrimEnd();

Backend/database/Database.cs

@@ -1,9 +1,9 @@
-using AFRA.Members.database.Tables;
+using AFRA.Members.Backend.database.Tables;
 using LinqToDB;
 using LinqToDB.Configuration;
 using LinqToDB.Data;
 
-namespace AFRA.Members.database;
+namespace AFRA.Members.Backend.database;
 
 public class Database {
 	public class ConnectionStringSettings : IConnectionStringSettings {

Backend/database/Tables/DbInfo.cs

@@ -1,6 +1,6 @@
 using LinqToDB.Mapping;
 
-namespace AFRA.Members.database.Tables;
+namespace AFRA.Members.Backend.database.Tables;
 
 [Table(Name = "DbInfo")]
 public class DbInfo {

Backend/database/Tables/Member.cs

@@ -1,6 +1,6 @@
 using LinqToDB.Mapping;
 
-namespace AFRA.Members.database.Tables;
+namespace AFRA.Members.Backend.database.Tables;
 
 [Table(Name = "Members")]
 public class Member {

LICENSE

@@ -0,0 +1,24 @@
+Be Gay, Do Crimes License
+
+Copyright (c) 2022 Laura Hausmann
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+Be Gay
+Do Crimes
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Pages/AddMember.cshtml

@@ -1,5 +1,4 @@
 @page
-@using AFRA.Members.database
 @model AFRA.Members.Pages.AddMember
 @{
 	ViewData["Title"] = "Add Member";

Pages/AddMember.cshtml.cs

@@ -1,5 +1,5 @@
-using AFRA.Members.database;
-using AFRA.Members.database.Tables;
+using AFRA.Members.Backend.database;
+using AFRA.Members.Backend.database.Tables;
 using LinqToDB;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;

Pages/EditMember.cshtml

@@ -1,5 +1,5 @@
 @page "{id}"
-@using AFRA.Members.database
+@using AFRA.Members.Backend.database
 @model AFRA.Members.Pages.EditMember
 @{
 	ViewData["Title"] = "Edit Member";

Pages/EditMember.cshtml.cs

@@ -1,4 +1,4 @@
-using AFRA.Members.database;
+using AFRA.Members.Backend.database;
 using LinqToDB;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;

Pages/Export.cshtml

@@ -1,5 +1,5 @@
 @page
-@using AFRA.Members.database
+@using AFRA.Members.Backend.database
 @{
 	Response.Headers.ContentType = "text/plain";
 	Response.Headers.ContentDisposition = "attachment; filename=\"afra-members-export.txt\"";

Pages/GenMail.cshtml

@@ -1,5 +1,5 @@
 @page "{id}"
-@using AFRA.Members.database
+@using AFRA.Members.Backend.database
 @model AFRA.Members.Pages.GenMail
 @{
 	ViewData["Title"] = "Edit Member";

Pages/GenMail.cshtml.cs

@@ -1,5 +1,4 @@
-using AFRA.Members.database;
-using LinqToDB;
+using LinqToDB;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 

Pages/Index.cshtml

@@ -1,6 +1,7 @@
 @page
-@using AFRA.Members.database
 @using System.Globalization
+@using AFRA.Members.Backend
+@using AFRA.Members.Backend.database
 @model IndexModel
 @{
 	ViewData["Title"] = "Members";

Pages/_ViewImports.cshtml

@@ -0,0 +1,2 @@
+@namespace AFRA.Members.Pages
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

README.md

@@ -1,2 +1,2 @@
-# AfRA tools repo
-This repository contains various tools for managing the [AfRA Berlin](https://afra-berlin.de) hackerspace.
+# AfRA.Members
+WebUI for managing the member database of the [AfRA Berlin](https://afra-berlin.de) hackerspace.