From bfa94333503624ca16bbd77a3c2bea38ddf2d366 Mon Sep 17 00:00:00 2001 From: Chris Jean-Marie Date: Fri, 20 Sep 2024 00:15:32 +0000 Subject: [PATCH] Moved backend into backend folder --- .cargo/config.toml | 2 + .devcontainer/Dockerfile | 8 +-- .devcontainer/devcontainer.json | 47 ++++++------------ .devcontainer/docker-compose.yml | 15 +----- .gitignore | 2 +- Dockerfile | 18 ------- Cargo.lock => backend/Cargo.lock | 0 Cargo.toml => backend/Cargo.toml | 0 build.rs => backend/build.rs | 0 .../20221012234646_initial_setup.sql | 0 run.sh => backend/run.sh | 0 runprod.sh => backend/runprod.sh | 0 {src => backend/src}/db.rs | 0 {src => backend/src}/discord_oauth.rs | 0 {src => backend/src}/facebook_oauth.rs | 0 {src => backend/src}/google_oauth.rs | 0 {src => backend/src}/initialmain.rs | 0 {src => backend/src}/main.rs | 33 ++++++++---- {src => backend/src}/oauth.rs | 0 {system => backend/system}/sn-workspace.json | 0 .../assets/css/bootstrap-responsive.css | 0 .../templates}/assets/css/bootstrap.css | 0 .../templates}/assets/css/content.css | 0 .../templates}/assets/fonts/Flaticon.woff | Bin .../templates}/assets/fonts/FontAwesome.otf | Bin .../assets/fonts/flexslider-icon.eot | Bin .../assets/fonts/flexslider-icon.svg | 0 .../assets/fonts/flexslider-icon.ttf | Bin .../assets/fonts/flexslider-icon.woff | Bin .../assets/fonts/fontawesome-webfont.eot | Bin .../assets/fonts/fontawesome-webfont.svg | 0 .../assets/fonts/fontawesome-webfont.ttf | Bin .../assets/fonts/fontawesome-webfont.woff | Bin .../assets/fonts/fontawesome-webfont.woff2 | Bin .../templates}/assets/fonts/slick.eot | Bin .../templates}/assets/fonts/slick.svg | 0 .../templates}/assets/fonts/slick.ttf | Bin .../templates}/assets/fonts/slick.woff | Bin .../assets/icons/numix-circle/discord.svg | 0 .../icons/numix-circle/web-facebook.svg | 0 .../assets/icons/numix-circle/web-google.svg | 0 .../templates}/assets/images/slide-01.jpg | Bin .../templates}/assets/images/slide-02.jpg | Bin .../templates}/assets/images/slide-03.jpg | Bin .../templates}/assets/js/bootstrap-alert.js | 0 .../templates}/assets/js/bootstrap-button.js | 0 .../assets/js/bootstrap-carousel.js | 0 .../assets/js/bootstrap-collapse.js | 0 .../assets/js/bootstrap-dropdown.js | 0 .../templates}/assets/js/bootstrap-modal.js | 0 .../templates}/assets/js/bootstrap-popover.js | 0 .../assets/js/bootstrap-scrollspy.js | 0 .../templates}/assets/js/bootstrap-tab.js | 0 .../templates}/assets/js/bootstrap-tooltip.js | 0 .../assets/js/bootstrap-transition.js | 0 .../assets/js/bootstrap-typeahead.js | 0 .../templates}/assets/js/holder.js | 0 .../templates}/assets/js/jquery.js | 0 {templates => backend/templates}/base.html | 0 .../templates}/dashboard.html | 0 {templates => backend/templates}/index.html | 0 {templates => backend/templates}/login.html | 0 docker-compose.yaml | 20 -------- 63 files changed, 43 insertions(+), 102 deletions(-) create mode 100644 .cargo/config.toml delete mode 100644 Dockerfile rename Cargo.lock => backend/Cargo.lock (100%) rename Cargo.toml => backend/Cargo.toml (100%) rename build.rs => backend/build.rs (100%) rename {migrations => backend/migrations}/20221012234646_initial_setup.sql (100%) rename run.sh => backend/run.sh (100%) rename runprod.sh => backend/runprod.sh (100%) rename {src => backend/src}/db.rs (100%) rename {src => backend/src}/discord_oauth.rs (100%) rename {src => backend/src}/facebook_oauth.rs (100%) rename {src => backend/src}/google_oauth.rs (100%) rename {src => backend/src}/initialmain.rs (100%) rename {src => backend/src}/main.rs (82%) rename {src => backend/src}/oauth.rs (100%) rename {system => backend/system}/sn-workspace.json (100%) rename {templates => backend/templates}/assets/css/bootstrap-responsive.css (100%) rename {templates => backend/templates}/assets/css/bootstrap.css (100%) rename {templates => backend/templates}/assets/css/content.css (100%) rename {templates => backend/templates}/assets/fonts/Flaticon.woff (100%) rename {templates => backend/templates}/assets/fonts/FontAwesome.otf (100%) rename {templates => backend/templates}/assets/fonts/flexslider-icon.eot (100%) rename {templates => backend/templates}/assets/fonts/flexslider-icon.svg (100%) rename {templates => backend/templates}/assets/fonts/flexslider-icon.ttf (100%) rename {templates => backend/templates}/assets/fonts/flexslider-icon.woff (100%) rename {templates => backend/templates}/assets/fonts/fontawesome-webfont.eot (100%) rename {templates => backend/templates}/assets/fonts/fontawesome-webfont.svg (100%) rename {templates => backend/templates}/assets/fonts/fontawesome-webfont.ttf (100%) rename {templates => backend/templates}/assets/fonts/fontawesome-webfont.woff (100%) rename {templates => backend/templates}/assets/fonts/fontawesome-webfont.woff2 (100%) rename {templates => backend/templates}/assets/fonts/slick.eot (100%) rename {templates => backend/templates}/assets/fonts/slick.svg (100%) rename {templates => backend/templates}/assets/fonts/slick.ttf (100%) rename {templates => backend/templates}/assets/fonts/slick.woff (100%) rename {templates => backend/templates}/assets/icons/numix-circle/discord.svg (100%) rename {templates => backend/templates}/assets/icons/numix-circle/web-facebook.svg (100%) rename {templates => backend/templates}/assets/icons/numix-circle/web-google.svg (100%) rename {templates => backend/templates}/assets/images/slide-01.jpg (100%) rename {templates => backend/templates}/assets/images/slide-02.jpg (100%) rename {templates => backend/templates}/assets/images/slide-03.jpg (100%) rename {templates => backend/templates}/assets/js/bootstrap-alert.js (100%) rename {templates => backend/templates}/assets/js/bootstrap-button.js (100%) rename {templates => backend/templates}/assets/js/bootstrap-carousel.js (100%) rename {templates => backend/templates}/assets/js/bootstrap-collapse.js (100%) rename {templates => backend/templates}/assets/js/bootstrap-dropdown.js (100%) rename {templates => backend/templates}/assets/js/bootstrap-modal.js (100%) rename {templates => backend/templates}/assets/js/bootstrap-popover.js (100%) rename {templates => backend/templates}/assets/js/bootstrap-scrollspy.js (100%) rename {templates => backend/templates}/assets/js/bootstrap-tab.js (100%) rename {templates => backend/templates}/assets/js/bootstrap-tooltip.js (100%) rename {templates => backend/templates}/assets/js/bootstrap-transition.js (100%) rename {templates => backend/templates}/assets/js/bootstrap-typeahead.js (100%) rename {templates => backend/templates}/assets/js/holder.js (100%) rename {templates => backend/templates}/assets/js/jquery.js (100%) rename {templates => backend/templates}/base.html (100%) rename {templates => backend/templates}/dashboard.html (100%) rename {templates => backend/templates}/index.html (100%) rename {templates => backend/templates}/login.html (100%) delete mode 100644 docker-compose.yaml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 0000000..f4d28a3 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,2 @@ +[build] +rustflags = ["-C", "link-arg=-fuse-ld=lld"] diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 6a653d1..6f90e20 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,13 +1,7 @@ -# [Choice] Debian OS version (use bullseye on local arm64/Apple Silicon): buster, bullseye -ARG VARIANT="bullseye" -FROM mcr.microsoft.com/vscode/devcontainers/rust:0-${VARIANT} +FROM mcr.microsoft.com/devcontainers/rust:1-1-bookworm # Include lld linker to improve build times either by using environment variable # RUSTFLAGS="-C link-arg=-fuse-ld=lld" or with Cargo's configuration file (i.e see .cargo/config.toml). RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y install clang lld \ && apt-get autoremove -y && apt-get clean -y - -# Add tools for wasm development -RUN rustup target add wasm32-unknown-unknown \ - && cargo install trunk cargo-edit cargo-watch \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index cbac3d9..2d1b5a1 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,45 +1,28 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: -// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/rust-postgres +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/rust-postgres { "name": "Rust and PostgreSQL", "dockerComposeFile": "docker-compose.yml", "service": "app", - "workspaceFolder": "/workspace", - - // Configure tool-specific properties. - "customizations": { - // Configure properties specific to VS Code. - "vscode": { - // Set *default* container specific settings.json values on container create. - "settings": { - "lldb.executable": "/usr/bin/lldb", - // VS Code don't watch files under ./target - "files.watcherExclude": { - "**/target/**": true - }, - "rust-analyzer.checkOnSave.command": "clippy" - }, - - // Add the IDs of extensions you want installed when the container is created. - "extensions": [ - "vadimcn.vscode-lldb", - "mutantdino.resourcemonitor", - "rust-lang.rust-analyzer", - "tamasfe.even-better-toml", - "serayuzgur.crates" - ] - } + "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", + "features": { + "ghcr.io/devcontainers/features/node:1": {}, + "ghcr.io/lee-orr/rusty-dev-containers/cargo-watch:0": {}, + "ghcr.io/lumenpink/devcontainer-features/wasm-pack:0": {} }, + // Features to add to the dev container. More info: https://containers.dev/features. + // "features": {}, + // Use 'forwardPorts' to make a list of ports inside the container available locally. // "forwardPorts": [5432], // Use 'postCreateCommand' to run commands after the container is created. // "postCreateCommand": "rustc --version", - // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. - "remoteUser": "vscode", - "features": { - "docker-in-docker": "latest" - } + // Configure tool-specific properties. + // "customizations": {}, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + "remoteUser": "root" } diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index a909d99..5c16f9c 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -8,22 +8,12 @@ services: build: context: . dockerfile: Dockerfile - args: - # Use the VARIANT arg to pick a Debian OS version: buster, bullseye - # Use bullseye when on local on arm64/Apple Silicon. - VARIANT: bullseye env_file: # Ensure that the variables in .env match the same variables in devcontainer.json - .env - # Security Opt and cap_add for C++ based debuggers to work. - # See `runArgs`: https://github.com/Microsoft/vscode-docs/blob/main/docs/remote/devcontainerjson-reference.md - # security_opt: - # - seccomp:unconfined - # cap_add: - # - SYS_PTRACE volumes: - - ..:/workspace:cached + - ../..:/workspaces:cached # Overrides default command so things don't shut down after the process ends. command: sleep infinity @@ -31,9 +21,6 @@ services: # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function. network_mode: service:db - # Uncomment the next line to use a non-root user for all processes. - # user: vscode - # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. # (Adding the "ports" property to this file will not forward from a Codespace.) diff --git a/.gitignore b/.gitignore index ea8c4bf..e44ccbc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/target +backend/target diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index dc35fe0..0000000 --- a/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM rust:1.59 as builder - -RUN USER=root cargo new --bin jean-marie -WORKDIR /jean-marie -COPY ./Cargo.toml ./Cargo.toml -RUN cargo build --release -RUN rm src/*.rs - -ADD . ./ - -RUN rm ./target/release/deps/jean_marie* -RUN cargo build --release - -FROM debian:buster-slim -COPY --from=builder /jean-marie/target/release/jean-marie . -RUN mkdir -p /templates -CMD ["./jean-marie"] - \ No newline at end of file diff --git a/Cargo.lock b/backend/Cargo.lock similarity index 100% rename from Cargo.lock rename to backend/Cargo.lock diff --git a/Cargo.toml b/backend/Cargo.toml similarity index 100% rename from Cargo.toml rename to backend/Cargo.toml diff --git a/build.rs b/backend/build.rs similarity index 100% rename from build.rs rename to backend/build.rs diff --git a/migrations/20221012234646_initial_setup.sql b/backend/migrations/20221012234646_initial_setup.sql similarity index 100% rename from migrations/20221012234646_initial_setup.sql rename to backend/migrations/20221012234646_initial_setup.sql diff --git a/run.sh b/backend/run.sh similarity index 100% rename from run.sh rename to backend/run.sh diff --git a/runprod.sh b/backend/runprod.sh similarity index 100% rename from runprod.sh rename to backend/runprod.sh diff --git a/src/db.rs b/backend/src/db.rs similarity index 100% rename from src/db.rs rename to backend/src/db.rs diff --git a/src/discord_oauth.rs b/backend/src/discord_oauth.rs similarity index 100% rename from src/discord_oauth.rs rename to backend/src/discord_oauth.rs diff --git a/src/facebook_oauth.rs b/backend/src/facebook_oauth.rs similarity index 100% rename from src/facebook_oauth.rs rename to backend/src/facebook_oauth.rs diff --git a/src/google_oauth.rs b/backend/src/google_oauth.rs similarity index 100% rename from src/google_oauth.rs rename to backend/src/google_oauth.rs diff --git a/src/initialmain.rs b/backend/src/initialmain.rs similarity index 100% rename from src/initialmain.rs rename to backend/src/initialmain.rs diff --git a/src/main.rs b/backend/src/main.rs similarity index 82% rename from src/main.rs rename to backend/src/main.rs index 62bbb11..7e18788 100644 --- a/src/main.rs +++ b/backend/src/main.rs @@ -45,6 +45,13 @@ struct LoginTemplate { name: String, } +#[derive(Template)] +#[template(path = "dashboard.html")] +struct DashboardTemplate { + logged_in: bool, + name: String, +} + #[derive(Debug, Serialize, Deserialize)] struct User { id: String, @@ -78,17 +85,10 @@ async fn main() { // build our application with some routes let app = Router::new() - .route("/assets", get_service(ServeDir::new("templates/assets")) -// .handle_error( -// |error: std::io::Error| async move { -// ( -// StatusCode::INTERNAL_SERVER_ERROR, -// format!("Unhandled internal error: {}", error), -// ) -// }, -// ), - ) + .nest_service("/assets", ServeDir::new("templates/assets") + .fallback(get_service(ServeDir::new("templates/assets")))) .route("/", get(index)) + .route("/dashboard", get(dashboard)) .route("/login", get(login)) .route("/google_auth", get(google_auth)) .route("/auth/google", get(google_authorized)) @@ -125,3 +125,16 @@ async fn login(session: Session) -> impl IntoResponse { let template = LoginTemplate { logged_in, name }; HtmlTemplate(template) } + +async fn dashboard(session: Session) -> impl IntoResponse { + let logged_in = session.get("logged_in").unwrap_or(false); + let name = session.get("name").unwrap_or("".to_string()); + + session.set_store(true); + + session.set("logged_in", logged_in); + session.set("name", &name); + + let template = DashboardTemplate { logged_in, name }; + HtmlTemplate(template) +} \ No newline at end of file diff --git a/src/oauth.rs b/backend/src/oauth.rs similarity index 100% rename from src/oauth.rs rename to backend/src/oauth.rs diff --git a/system/sn-workspace.json b/backend/system/sn-workspace.json similarity index 100% rename from system/sn-workspace.json rename to backend/system/sn-workspace.json diff --git a/templates/assets/css/bootstrap-responsive.css b/backend/templates/assets/css/bootstrap-responsive.css similarity index 100% rename from templates/assets/css/bootstrap-responsive.css rename to backend/templates/assets/css/bootstrap-responsive.css diff --git a/templates/assets/css/bootstrap.css b/backend/templates/assets/css/bootstrap.css similarity index 100% rename from templates/assets/css/bootstrap.css rename to backend/templates/assets/css/bootstrap.css diff --git a/templates/assets/css/content.css b/backend/templates/assets/css/content.css similarity index 100% rename from templates/assets/css/content.css rename to backend/templates/assets/css/content.css diff --git a/templates/assets/fonts/Flaticon.woff b/backend/templates/assets/fonts/Flaticon.woff similarity index 100% rename from templates/assets/fonts/Flaticon.woff rename to backend/templates/assets/fonts/Flaticon.woff diff --git a/templates/assets/fonts/FontAwesome.otf b/backend/templates/assets/fonts/FontAwesome.otf similarity index 100% rename from templates/assets/fonts/FontAwesome.otf rename to backend/templates/assets/fonts/FontAwesome.otf diff --git a/templates/assets/fonts/flexslider-icon.eot b/backend/templates/assets/fonts/flexslider-icon.eot similarity index 100% rename from templates/assets/fonts/flexslider-icon.eot rename to backend/templates/assets/fonts/flexslider-icon.eot diff --git a/templates/assets/fonts/flexslider-icon.svg b/backend/templates/assets/fonts/flexslider-icon.svg similarity index 100% rename from templates/assets/fonts/flexslider-icon.svg rename to backend/templates/assets/fonts/flexslider-icon.svg diff --git a/templates/assets/fonts/flexslider-icon.ttf b/backend/templates/assets/fonts/flexslider-icon.ttf similarity index 100% rename from templates/assets/fonts/flexslider-icon.ttf rename to backend/templates/assets/fonts/flexslider-icon.ttf diff --git a/templates/assets/fonts/flexslider-icon.woff b/backend/templates/assets/fonts/flexslider-icon.woff similarity index 100% rename from templates/assets/fonts/flexslider-icon.woff rename to backend/templates/assets/fonts/flexslider-icon.woff diff --git a/templates/assets/fonts/fontawesome-webfont.eot b/backend/templates/assets/fonts/fontawesome-webfont.eot similarity index 100% rename from templates/assets/fonts/fontawesome-webfont.eot rename to backend/templates/assets/fonts/fontawesome-webfont.eot diff --git a/templates/assets/fonts/fontawesome-webfont.svg b/backend/templates/assets/fonts/fontawesome-webfont.svg similarity index 100% rename from templates/assets/fonts/fontawesome-webfont.svg rename to backend/templates/assets/fonts/fontawesome-webfont.svg diff --git a/templates/assets/fonts/fontawesome-webfont.ttf b/backend/templates/assets/fonts/fontawesome-webfont.ttf similarity index 100% rename from templates/assets/fonts/fontawesome-webfont.ttf rename to backend/templates/assets/fonts/fontawesome-webfont.ttf diff --git a/templates/assets/fonts/fontawesome-webfont.woff b/backend/templates/assets/fonts/fontawesome-webfont.woff similarity index 100% rename from templates/assets/fonts/fontawesome-webfont.woff rename to backend/templates/assets/fonts/fontawesome-webfont.woff diff --git a/templates/assets/fonts/fontawesome-webfont.woff2 b/backend/templates/assets/fonts/fontawesome-webfont.woff2 similarity index 100% rename from templates/assets/fonts/fontawesome-webfont.woff2 rename to backend/templates/assets/fonts/fontawesome-webfont.woff2 diff --git a/templates/assets/fonts/slick.eot b/backend/templates/assets/fonts/slick.eot similarity index 100% rename from templates/assets/fonts/slick.eot rename to backend/templates/assets/fonts/slick.eot diff --git a/templates/assets/fonts/slick.svg b/backend/templates/assets/fonts/slick.svg similarity index 100% rename from templates/assets/fonts/slick.svg rename to backend/templates/assets/fonts/slick.svg diff --git a/templates/assets/fonts/slick.ttf b/backend/templates/assets/fonts/slick.ttf similarity index 100% rename from templates/assets/fonts/slick.ttf rename to backend/templates/assets/fonts/slick.ttf diff --git a/templates/assets/fonts/slick.woff b/backend/templates/assets/fonts/slick.woff similarity index 100% rename from templates/assets/fonts/slick.woff rename to backend/templates/assets/fonts/slick.woff diff --git a/templates/assets/icons/numix-circle/discord.svg b/backend/templates/assets/icons/numix-circle/discord.svg similarity index 100% rename from templates/assets/icons/numix-circle/discord.svg rename to backend/templates/assets/icons/numix-circle/discord.svg diff --git a/templates/assets/icons/numix-circle/web-facebook.svg b/backend/templates/assets/icons/numix-circle/web-facebook.svg similarity index 100% rename from templates/assets/icons/numix-circle/web-facebook.svg rename to backend/templates/assets/icons/numix-circle/web-facebook.svg diff --git a/templates/assets/icons/numix-circle/web-google.svg b/backend/templates/assets/icons/numix-circle/web-google.svg similarity index 100% rename from templates/assets/icons/numix-circle/web-google.svg rename to backend/templates/assets/icons/numix-circle/web-google.svg diff --git a/templates/assets/images/slide-01.jpg b/backend/templates/assets/images/slide-01.jpg similarity index 100% rename from templates/assets/images/slide-01.jpg rename to backend/templates/assets/images/slide-01.jpg diff --git a/templates/assets/images/slide-02.jpg b/backend/templates/assets/images/slide-02.jpg similarity index 100% rename from templates/assets/images/slide-02.jpg rename to backend/templates/assets/images/slide-02.jpg diff --git a/templates/assets/images/slide-03.jpg b/backend/templates/assets/images/slide-03.jpg similarity index 100% rename from templates/assets/images/slide-03.jpg rename to backend/templates/assets/images/slide-03.jpg diff --git a/templates/assets/js/bootstrap-alert.js b/backend/templates/assets/js/bootstrap-alert.js similarity index 100% rename from templates/assets/js/bootstrap-alert.js rename to backend/templates/assets/js/bootstrap-alert.js diff --git a/templates/assets/js/bootstrap-button.js b/backend/templates/assets/js/bootstrap-button.js similarity index 100% rename from templates/assets/js/bootstrap-button.js rename to backend/templates/assets/js/bootstrap-button.js diff --git a/templates/assets/js/bootstrap-carousel.js b/backend/templates/assets/js/bootstrap-carousel.js similarity index 100% rename from templates/assets/js/bootstrap-carousel.js rename to backend/templates/assets/js/bootstrap-carousel.js diff --git a/templates/assets/js/bootstrap-collapse.js b/backend/templates/assets/js/bootstrap-collapse.js similarity index 100% rename from templates/assets/js/bootstrap-collapse.js rename to backend/templates/assets/js/bootstrap-collapse.js diff --git a/templates/assets/js/bootstrap-dropdown.js b/backend/templates/assets/js/bootstrap-dropdown.js similarity index 100% rename from templates/assets/js/bootstrap-dropdown.js rename to backend/templates/assets/js/bootstrap-dropdown.js diff --git a/templates/assets/js/bootstrap-modal.js b/backend/templates/assets/js/bootstrap-modal.js similarity index 100% rename from templates/assets/js/bootstrap-modal.js rename to backend/templates/assets/js/bootstrap-modal.js diff --git a/templates/assets/js/bootstrap-popover.js b/backend/templates/assets/js/bootstrap-popover.js similarity index 100% rename from templates/assets/js/bootstrap-popover.js rename to backend/templates/assets/js/bootstrap-popover.js diff --git a/templates/assets/js/bootstrap-scrollspy.js b/backend/templates/assets/js/bootstrap-scrollspy.js similarity index 100% rename from templates/assets/js/bootstrap-scrollspy.js rename to backend/templates/assets/js/bootstrap-scrollspy.js diff --git a/templates/assets/js/bootstrap-tab.js b/backend/templates/assets/js/bootstrap-tab.js similarity index 100% rename from templates/assets/js/bootstrap-tab.js rename to backend/templates/assets/js/bootstrap-tab.js diff --git a/templates/assets/js/bootstrap-tooltip.js b/backend/templates/assets/js/bootstrap-tooltip.js similarity index 100% rename from templates/assets/js/bootstrap-tooltip.js rename to backend/templates/assets/js/bootstrap-tooltip.js diff --git a/templates/assets/js/bootstrap-transition.js b/backend/templates/assets/js/bootstrap-transition.js similarity index 100% rename from templates/assets/js/bootstrap-transition.js rename to backend/templates/assets/js/bootstrap-transition.js diff --git a/templates/assets/js/bootstrap-typeahead.js b/backend/templates/assets/js/bootstrap-typeahead.js similarity index 100% rename from templates/assets/js/bootstrap-typeahead.js rename to backend/templates/assets/js/bootstrap-typeahead.js diff --git a/templates/assets/js/holder.js b/backend/templates/assets/js/holder.js similarity index 100% rename from templates/assets/js/holder.js rename to backend/templates/assets/js/holder.js diff --git a/templates/assets/js/jquery.js b/backend/templates/assets/js/jquery.js similarity index 100% rename from templates/assets/js/jquery.js rename to backend/templates/assets/js/jquery.js diff --git a/templates/base.html b/backend/templates/base.html similarity index 100% rename from templates/base.html rename to backend/templates/base.html diff --git a/templates/dashboard.html b/backend/templates/dashboard.html similarity index 100% rename from templates/dashboard.html rename to backend/templates/dashboard.html diff --git a/templates/index.html b/backend/templates/index.html similarity index 100% rename from templates/index.html rename to backend/templates/index.html diff --git a/templates/login.html b/backend/templates/login.html similarity index 100% rename from templates/login.html rename to backend/templates/login.html diff --git a/docker-compose.yaml b/docker-compose.yaml deleted file mode 100644 index 4fcc444..0000000 --- a/docker-compose.yaml +++ /dev/null @@ -1,20 +0,0 @@ -version: "3" -services: - jmqa: - image: silverfox68/jeanmarie:test - container_name: jmqa - environment: - - PUID=${PUID} - - PGID=${PGID} - - TZ=${TZ} - - GOOGLE_CLIENT_ID=735264084619-clsmvgdqdmum4rvrcj0kuk28k9agir1c.apps.googleusercontent.com - - GOOGLE_CLIENT_SECRET=L6uI7FQGoMJd-ay1HO_iGJ6M - - DISCORD_CLIENT_ID=956189108559036427 - - DISCORD_CLIENT_SECRET=dx2DZxjDhVMCCnGX4xpz5MxSTgZ4lHBI - - FACEBOOK_CLIENT_ID=1529124327484248 - - FACEBOOK_CLIENT_SECRET=189509b5eb907b3ce34b7e8459030f21 - volumes: - - ../jean-marie/templates:/templates - ports: - - 40192:40192 - restart: unless-stopped