From 77bac94251e7ff1e0a188e6a015756e2f098ed4a Mon Sep 17 00:00:00 2001 From: DIVISIONSolar Date: Thu, 29 Feb 2024 13:46:09 -0500 Subject: [PATCH] e --- .devcontainer/devcontainer.json | 12 ----- .github/ISSUE_TEMPLATE/bug_report.md | 48 ------------------- .github/ISSUE_TEMPLATE/config.yml | 8 ---- .github/workflows/docker-image.yml | 70 ---------------------------- .github/workflows/eslint.yml | 51 -------------------- .replit | 13 ------ Dockerfile | 19 -------- README.md | 18 ------- docker-compose.yml | 9 ---- package-lock.json | 8 ++-- package.json | 8 ++-- replit.nix | 5 -- 12 files changed, 8 insertions(+), 261 deletions(-) delete mode 100644 .devcontainer/devcontainer.json delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 .github/ISSUE_TEMPLATE/config.yml delete mode 100644 .github/workflows/docker-image.yml delete mode 100644 .github/workflows/eslint.yml delete mode 100644 .replit delete mode 100644 Dockerfile delete mode 100644 README.md delete mode 100644 docker-compose.yml delete mode 100644 replit.nix diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 0ad92b2..0000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "Ultraviolet-Devel", - "build": { - "dockerfile": "../docker/Dockerfile", - "target": "devel", - "context": "../" - }, - "forwardPorts": [ - 8080 - ], - "workspaceFolder": "/app" - } diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index a73c767..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,48 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: "" -labels: "" -assignees: "" ---- - -Issue tracker is **ONLY** used for reporting bugs. New features should be discussed on our Discord server. - - - -## Expected Behavior - - - -## Current Behavior - - - -## Possible Solution - - - -## Steps to Reproduce - - - - -1. -2. -3. -4. - -## Context (Environment) - - - - - - -## Detailed Description - - - -## Possible Implementation - - diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index eb5ff01..0000000 --- a/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,8 +0,0 @@ -blank_issues_enabled: false -contact_links: - - name: Community Support - url: https://discord.gg/unblock - about: Please ask and answer questions here. - - name: Heroku, Repl.it, Blocked site issues - url: https://www.youtube.com/watch?v=BLUkgRAy_Vo - about: Do not create issues for these. diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml deleted file mode 100644 index 09ed032..0000000 --- a/.github/workflows/docker-image.yml +++ /dev/null @@ -1,70 +0,0 @@ -name: Build and Push to Docker Hub - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - schedule: - - cron: "30 12 * * 0" # Run once every Sunday - -env: - REPO: ultraviolet-node - PLATFORMS: linux/amd64,linux/arm64 - -jobs: - build_and_push_docker_images: - name: Push Docker image to Docker Hub - runs-on: ubuntu-latest - steps: - - name: Check out the repo - uses: actions/checkout@v3 - - - name: Login to DockerHub - if: github.event_name != 'pull_request' - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERUSERNAME }} - password: ${{ secrets.DOCKERPASSWORD }} - - - name: Build Test Image - uses: redhat-actions/buildah-build@v2 - with: - image: ${{ env.REPO }} - tags: test - containerfiles: | - ./docker/Dockerfile - build-args: | - NPM_BUILD=npm ci --omit=dev --frozen-lockfile - - - name: Test - run: | - podman run --rm -d -p 8080:8080 localhost/${{ env.REPO }}:test - chmod +x ./docker/test.sh - ./docker/test.sh -p 8080 -h 0.0.0.0 -t 15 - - - name: Install qemu - if: github.event_name != 'pull_request' - run: | - sudo apt-get install -y qemu-user-static - - - name: Build Production Images - if: github.event_name != 'pull_request' - id: build-image - uses: redhat-actions/buildah-build@v2 - with: - image: ${{ env.REPO }} - tags: latest ${{ github.sha }} - containerfiles: | - ./docker/Dockerfile - platforms: ${{ env.PLATFORMS }} - build-args: | - NPM_BUILD=npm ci --omit=dev --frozen-lockfile - - - name: Push To Docker Hub - if: github.event_name != 'pull_request' - uses: redhat-actions/push-to-registry@v2 - with: - image: ${{ steps.build-image.outputs.image }} - tags: ${{ steps.build-image.outputs.tags }} - registry: docker.io/${{ secrets.DOCKERUSERNAME }} diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml deleted file mode 100644 index 8232f0c..0000000 --- a/.github/workflows/eslint.yml +++ /dev/null @@ -1,51 +0,0 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. -# ESLint is a tool for identifying and reporting on patterns -# found in ECMAScript/JavaScript code. -# More details at https://github.com/eslint/eslint -# and https://eslint.org - -# https://github.com/actions/starter-workflows/blob/main/code-scanning/eslint.yml - -name: ESLint - -on: - push: - branches: ["main"] - pull_request: - branches: ["main"] - schedule: - - cron: "30 12 * * 0" # Run once every Sunday - -jobs: - eslint: - name: Run eslint scanning - runs-on: ubuntu-latest - permissions: - contents: read - security-events: write - actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Install ESLint - run: | - npm install eslint@8.10.0 - npm install @microsoft/eslint-formatter-sarif@2.1.7 - - - name: Run ESLint - run: npx eslint . - --config .eslintrc.json - --ext .js,.jsx,.ts,.tsx - --format @microsoft/eslint-formatter-sarif - --output-file eslint-results.sarif - continue-on-error: true - - - name: Upload analysis results to GitHub - uses: github/codeql-action/upload-sarif@v2 - with: - sarif_file: eslint-results.sarif - wait-for-processing: true \ No newline at end of file diff --git a/.replit b/.replit deleted file mode 100644 index e803f24..0000000 --- a/.replit +++ /dev/null @@ -1,13 +0,0 @@ -language = "nix" -run = ["npm", "start"] - -[packager] -language = "nodejs-npm" - -[nix] -channel = "stable-22_05" - -[debugger] - -[unitTest] -language = "nodejs" diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 10411a9..0000000 --- a/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM node:18-alpine - -ENV NODE_ENV=production -ARG NPM_BUILD="npm install --omit=dev" -EXPOSE 8080/tcp - -LABEL maintainer="TitaniumNetwork Ultraviolet Team" -LABEL summary="Ultraviolet Proxy Image" -LABEL description="Example application of Ultraviolet which can be deployed in production." - -WORKDIR /app - -COPY ["package.json", "package-lock.json", "./"] -RUN $NPM_BUILD - -COPY . . - -ENTRYPOINT [ "node" ] -CMD ["src/index.js"] diff --git a/README.md b/README.md deleted file mode 100644 index df28454..0000000 --- a/README.md +++ /dev/null @@ -1,18 +0,0 @@ -

- -

Ultraviolet-App

- -The deployable all-in-one bundle for [Ultraviolet](https://github.com/titaniumnetwork-dev/Ultraviolet), a highly sophisticated proxy used for evading internet censorship or accessing websites in a controlled sandbox using the power of service-workers and more! - -## Deployment - -[![Run on Replit](https://binbashbanana.github.io/deploy-buttons/buttons/remade/replit.svg)](https://github.com/titaniumnetwork-dev/Ultraviolet-App/wiki/Run-on-Replit) -[![Deploy on Railway](https://binbashbanana.github.io/deploy-buttons/buttons/remade/railway.svg)](https://github.com/titaniumnetwork-dev/Ultraviolet-App/wiki/Deploy-on-Railway) -[![Remix on Glitch](https://binbashbanana.github.io/deploy-buttons/buttons/remade/glitch.svg)](https://github.com/titaniumnetwork-dev/Ultraviolet-App/wiki/Remix-on-Glitch) -[![Deploy to Koyeb](https://binbashbanana.github.io/deploy-buttons/buttons/remade/koyeb.svg)](https://github.com/titaniumnetwork-dev/Ultraviolet-App/wiki/Deploy-to-Koyeb) - -If you are deploying to an alternative service or to a server, refer to [Deploy via terminal](https://github.com/titaniumnetwork-dev/Ultraviolet-App/wiki/Deploy-via-terminal). - -Additional information such as [customizing your frontend](https://github.com/titaniumnetwork-dev/Ultraviolet-App/wiki/Customizing-your-frontend) can be found on the [wiki](https://github.com/titaniumnetwork-dev/Ultraviolet-App/wiki). - -Support and updates can be found in our [Discord Server](discord.gg/unblock). diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 796fb57..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -services: - ultraviolet: - build: - context: . - dockerfile: docker/Dockerfile - args: - - NPM_BUILD=npm ci --omit=dev --frozen-lockfile - ports: - - "8080:8080" \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 4522cfc..80336b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,18 @@ { - "name": "uv-app", + "name": "rv-app", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "uv-app", + "name": "rv-app", "version": "1.0.0", "license": "GPL-3.0-or-later", "dependencies": { - "@titaniumnetwork-dev/ultraviolet": "^2.0.0", + "@RevelaNetwork/Revela": "^2.0.0", "@tomphttp/bare-server-node": "^2.0.0", "express": "^4.18.2", - "ultraviolet-static": "github:titaniumnetwork-dev/Ultraviolet-Static" + "revela-frontend": "github:RevelaNetwork/Revela-Frontend" }, "devDependencies": { "eslint": "^8.36.0", diff --git a/package.json b/package.json index cfbb875..bb57bc2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "uv-app", + "name": "rv-app", "version": "1.0.0", - "description": "Ultraviolet instance", + "description": "Revela instance", "type": "module", "engines": { "npm": ">=7.0.0", @@ -16,10 +16,10 @@ "author": "", "license": "GPL-3.0-or-later", "dependencies": { - "@titaniumnetwork-dev/ultraviolet": "^2.0.0", + "@RevelaNetwork/Revela": "^2.0.0", "@tomphttp/bare-server-node": "^2.0.0", "express": "^4.18.2", - "ultraviolet-static": "github:titaniumnetwork-dev/Ultraviolet-Static" + "revela-frontend": "github:RevelaNetwork/Revela-Frontend" }, "devDependencies": { "eslint": "^8.36.0", diff --git a/replit.nix b/replit.nix deleted file mode 100644 index 2432aff..0000000 --- a/replit.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs }: { - deps = [ - pkgs.nodejs-18_x - ]; -}