Skip to content

Commit

Permalink
V2 (#465)
Browse files Browse the repository at this point in the history
* Delete several application files

Numerous application files in the code were deleted, covering diverse aspects of the application. These ranged from API configurations to frontend components, and included Docker specifications as well. The overall impact of these changes would require various adjustments and replacements throughout the app to ensure its continued operation.

* Initial V2 Commit

* Refactor code formatting for readability and consistency

The code has been reformatted across multiple files for clarity and consistency. This includes improving code indentation, making import statements more readable, and changing the structure of objects and components. Function signatures and usage of various React and TypeScript features have also been updated for better understanding of the code. No functional changes were made.

* Add loading skeleton to GrocyStatus component

-added loading skeleton to the GrocyStatus component to enhance user experience during data fetching. Loading skeleton animations will show during the data fetching process before the final data is received and rendered, improving the perceived performance. This update also includes minor code formatting adjustments for better readability.

* Implement Grocy Product Combobox and improve recipe functionality

Added Grocy Product Combobox allowing product selection from a dropdown. Improved recipe functionality by creating a new recipe creation schema and procedure, enabling the creation of recipes in Grocy. Minor updates were made to the ingredient table and other modules for better data handling and user interaction. Updated Dockerfile for production. UI improvements and error handling changes were also made.

* Add user setup check, routing and server functionalities

Implemented a setup check for users in the API that prevents multiple setups. New related functionalities and files were created, such as setupUser and checkIsSetup services and procedures. Updated routing in several modules to accommodate the new user setup process. Added UI elements to facilitate user setup as well as adjusted styling across various components.

* Add user setup check, routing and server functionalities

Implemented a setup check for users in the API that prevents multiple setups. New related functionalities and files were created, such as setupUser and checkIsSetup services and procedures. Updated routing in several modules to accommodate the new user setup process. Added UI elements to facilitate user setup as well as adjusted styling across various components.

* Remove Tailwind CSS config file

The Tailwind CSS configuration file, tailwind.config.ts, was removed from the project. This file contained definitions for custom font families and content directories which are no longer needed. This clean-up is part of ongoing refactor to optimize the project structure and dependencies.

* okay here is v2

* sonarcloud less cross?

* few more bits

* ci stuff

* ci stuff

* ci stuff
  • Loading branch information
georgegebbett authored Apr 1, 2024
1 parent 47fef2f commit 9457c9b
Show file tree
Hide file tree
Showing 222 changed files with 13,039 additions and 13,106 deletions.
11 changes: 11 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Dockerfile
.dockerignore
node_modules
npm-debug.log
README.md
.next
.git
knip.json
sqlite.db
.env
.env.example
26 changes: 26 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Since the ".env" file is gitignored, you can use the ".env.example" file to
# build a new ".env" file when you clone the repo. Keep this file up-to-date
# when you add new variables to `.env`.

# This file will be committed to version control, so make sure not to have any
# secrets in it. If you are cloning this repo, create a copy of this file named
# ".env" and populate it with your secrets.

# When adding additional environment variables, the schema in "/src/env.js"
# should be updated accordingly.

# Drizzle
# Get the Database URL from the "prisma" dropdown selector in PlanetScale.
# Change the query params at the end of the URL to "?ssl={"rejectUnauthorized":true}"
DATABASE_URL='mysql://YOUR_MYSQL_URL_HERE?ssl={"rejectUnauthorized":true}'

# Next Auth
# You can generate a new secret on the command line with:
# openssl rand -base64 32
# https://next-auth.js.org/configuration/options#secret
# NEXTAUTH_SECRET=""
NEXTAUTH_URL="http://localhost:3000"

# Next Auth Discord Provider
DISCORD_CLIENT_ID=""
DISCORD_CLIENT_SECRET=""
51 changes: 51 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"$schema": "https://json.schemastore.org/eslintrc",
"root": true,
"extends": [
"next/core-web-vitals",
"prettier",
"plugin:tailwindcss/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended"
],
"plugins": [
"tailwindcss",
"react"
],
"rules": {
"@next/next/no-html-link-for-pages": "off",
"react/jsx-key": "off",
"react/no-array-index-key": "warn",
"tailwindcss/no-custom-classname": "off",
"tailwindcss/classnames-order": "error",
"react/prop-types": "off",
"react/no-unknown-property": "off"
},
"globals": {
"React": "writable"
},
"settings": {
"react": {
"version": "detect"
},
"tailwindcss": {
"callees": [
"cn",
"cva"
],
"config": "tailwind.config.js"
},
"next": {
"rootDir": true
}
},
"overrides": [
{
"files": [
"*.ts",
"*.tsx"
],
"parser": "@typescript-eslint/parser"
}
]
}
34 changes: 34 additions & 0 deletions .github/actions/build-setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: 'Prepare'
description: 'Sets up the build for NodeJS and cache'

runs:
using: "composite"
steps:
- name: Setup pnpm
uses: pnpm/[email protected]
with:
version: 8.15.5
run_install: false

- name: Setup Node 18
uses: actions/setup-node@v4
with:
node-version: 18

- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Install dependencies
shell: bash
run: pnpm install
8 changes: 8 additions & 0 deletions .github/actions/format/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: 'Format'
description: 'Ensures the repo matches Prettier rules'
runs:
using: "composite"
steps:
- name: Format
shell: bash
run: pnpm format
10 changes: 10 additions & 0 deletions .github/actions/lint/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: 'Lint'
description: 'Lints the repository'

runs:
using: "composite"
steps:
- name: Lint
shell: bash
run: pnpm lint

43 changes: 0 additions & 43 deletions .github/workflows/backend-ci.yml

This file was deleted.

24 changes: 24 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: CI

on:
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
code-style:
uses: ./.github/workflows/code-style.yml

check:
runs-on: ubuntu-20.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v3

- name: Setup
uses: ./.github/actions/build-setup

- name: Check
run: pnpm check
28 changes: 28 additions & 0 deletions .github/workflows/code-style.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Code Style Check
on:
workflow_call:

jobs:
lint:
runs-on: ubuntu-20.04
timeout-minutes: 5
steps:
- uses: actions/checkout@v3

- name: Setup
uses: ./.github/actions/build-setup

- name: Lint
uses: ./.github/actions/lint

format:
runs-on: ubuntu-20.04
timeout-minutes: 5
steps:
- uses: actions/checkout@v3

- name: Setup
uses: ./.github/actions/build-setup

- name: Format
uses: ./.github/actions/format
76 changes: 0 additions & 76 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

63 changes: 0 additions & 63 deletions .github/workflows/docker-publish.yml

This file was deleted.

Loading

0 comments on commit 9457c9b

Please sign in to comment.