Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change import css #11

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Build and Deploy
name: Build
on:
push:
branches:
branches-ignore:
- main
jobs:
build-and-deploy:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
Expand All @@ -14,9 +14,3 @@ jobs:
run: |
npm install
npm run build

- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@4.1.5
with:
branch: gh-pages
folder: dist
22 changes: 22 additions & 0 deletions .github/workflows/deploy-gh-pages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Build and Deploy
on:
push:
branches:
- main
jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@v2.3.1

- name: Install and Build 🔧
run: |
npm install
npm run build

- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@4.1.5
with:
branch: gh-pages
folder: dist
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,33 +31,33 @@
"@cher-ami/router": "^1.1.0",
"@solid-js/css-flat": "^1.0.1",
"@solid-js/signal": "^1.0.0-beta.1",
"@use-gesture/react": "^10.0.0",
"@use-gesture/react": "^10.1.0",
"@wbe/deferred-promise": "^2.4.0",
"@wbe/react-image": "^2.4.1",
"@wbe/use-window-size": "^2.4.0",
"encoding": "^0.1.13",
"face-api.js": "^0.22.2",
"file-saver": "^2.0.5",
"gsap": "^3.7.1",
"gsap": "^3.8.0",
"jszip": "^3.7.1",
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
"devDependencies": {
"@parcel/transformer-image": "^2.0.0-rc.0",
"@parcel/transformer-less": "^2.0.0-rc.0",
"@types/node": "^16.9.6",
"@types/react": "^17.0.24",
"@parcel/transformer-image": "^2.0.0",
"@parcel/transformer-less": "^2.0.0",
"@types/node": "^16.11.0",
"@types/react": "^17.0.30",
"@types/react-dom": "^17.0.9",
"debug": "^4.3.2",
"husky": "^7.0.2",
"less": "^4.1.1",
"lint-staged": "^11.1.2",
"parcel": "^2.0.0-rc.0",
"less": "^4.1.2",
"lint-staged": "^11.2.3",
"parcel": "^2.0.0",
"parcel-reporter-static-files-copy": "^1.3.0",
"prettier": "^2.4.1",
"tslib": "^2.3.1",
"typescript": "^4.4.3"
"typescript": "^4.4.4"
},
"lint-staged": {
"*.{tsx,ts,jsx,js,less,css,json,md}": [
Expand Down
2 changes: 1 addition & 1 deletion src/components/app/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import css from "./App.module.less"
import * as css from "./App.module.less"
import React, { useEffect, useState } from "react"
import { AppContext, IImageData } from "../../index"
import JSZip from "jszip"
Expand Down
2 changes: 1 addition & 1 deletion src/components/blurZone/BlurZone.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import css from "./BlurZone.module.less"
import * as css from "./BlurZone.module.less"
import React, { useEffect, useState } from "react"
import { merge } from "../../lib/utils/arrayUtils"

Expand Down
2 changes: 1 addition & 1 deletion src/components/blurZoneBuilder/BlurZoneBuilder.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import css from "./BlurZoneBuilder.module.less"
import * as css from "./BlurZoneBuilder.module.less"
import React, { useEffect, useRef, useState } from "react"
import { merge } from "../../lib/utils/arrayUtils"
import BlurZone, { TBlurZone } from "../blurZone/BlurZone"
Expand Down
2 changes: 1 addition & 1 deletion src/components/downloadButton/DownloadButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import css from "./DownloadButton.module.less"
import * as css from "./DownloadButton.module.less"
import React, { forwardRef, MutableRefObject, useContext } from "react"
import { merge } from "../../lib/utils/arrayUtils"
import { AppContext } from "../../index"
Expand Down
2 changes: 1 addition & 1 deletion src/components/github/Github.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import css from "./Github.module.less"
import * as css from "./Github.module.less"
import React from "react"
import { merge } from "../../lib/utils/arrayUtils"

Expand Down
2 changes: 1 addition & 1 deletion src/components/image/Image.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import css from "./Image.module.less"
import * as css from "./Image.module.less"
import React, { useContext, useEffect, useRef, useState } from "react"
import { useWindowSize } from "@wbe/use-window-size"
import { FaceDetection } from "face-api.js"
Expand Down
2 changes: 1 addition & 1 deletion src/components/inputImages/InputImages.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import css from "./InputImages.module.less"
import * as css from "./InputImages.module.less"
import React, { forwardRef, MutableRefObject, useContext, useRef } from "react"
import { merge } from "../../lib/utils/arrayUtils"
import { AppContext, IImageData } from "../../index"
Expand Down
2 changes: 1 addition & 1 deletion src/components/loader/Loader.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import css from "./Loader.module.less"
import * as css from "./Loader.module.less"
import React from "react"
import { merge } from "../../lib/utils/arrayUtils"

Expand Down
2 changes: 1 addition & 1 deletion src/components/logo/Logo.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import css from "./Logo.module.less"
import * as css from "./Logo.module.less"
import React, { forwardRef, MutableRefObject } from "react"
import { merge } from "../../lib/utils/arrayUtils"
import { DICO } from "../../data/dico"
Expand Down
2 changes: 1 addition & 1 deletion src/components/mainButton/MainButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import css from "./MainButton.module.less"
import * as css from "./MainButton.module.less"
import React from "react"
import { merge } from "../../lib/utils/arrayUtils"

Expand Down
2 changes: 1 addition & 1 deletion src/components/polaroid/Polaroid.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import css from "./Polaroid.module.less"
import * as css from "./Polaroid.module.less"
import React, { forwardRef, MutableRefObject } from "react"
import { merge } from "../../lib/utils/arrayUtils"

Expand Down
2 changes: 1 addition & 1 deletion src/components/restartButton/RestartButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import css from "./RestartButton.module.less"
import * as css from "./RestartButton.module.less"
import React, { forwardRef, MutableRefObject, useContext } from "react"
import { merge } from "../../lib/utils/arrayUtils"
import { AppContext } from "../../index"
Expand Down
2 changes: 1 addition & 1 deletion src/pages/galleryPage/GalleryPage.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import css from "./GalleryPage.module.less"
import * as css from "./GalleryPage.module.less"
import React, {
forwardRef,
ForwardedRef,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/homePage/HomePage.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import css from "./HomePage.module.less"
import * as css from "./HomePage.module.less"
import React, { forwardRef, ForwardedRef, useRef, useLayoutEffect } from "react"
import { useStack } from "@cher-ami/router"
import { gsap } from "gsap"
Expand Down