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

dev #18

Merged
merged 108 commits into from
Sep 3, 2024
Merged

dev #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
a4fb63f
nextjs scaffold
agnlez May 23, 2024
82c6b2f
dockerizes application
agnlez May 23, 2024
f6d61e0
eslint-plugin-import
agnlez May 24, 2024
5027b6e
bump dependencies
agnlez Jul 22, 2024
739d168
fixes linting
agnlez Jul 22, 2024
88b1a0c
fixes linting
agnlez Jul 22, 2024
4f9b0f9
Merge remote-tracking branch 'origin/dev' into dev
agnlez Jul 22, 2024
394ec8a
Merge pull request #3 from Vizzuality/chore/bump-dependencies
agnlez Jul 22, 2024
1933aa3
updates TailwindCSS config
agnlez Jul 23, 2024
8b71a80
landing page
agnlez Jul 23, 2024
191d09a
Merge pull request #4 from Vizzuality/feature/landing-page
agnlez Aug 5, 2024
f8d1c4c
WIP
agnlez Aug 5, 2024
952c273
Merge pull request #5 from Vizzuality/feature/about-page
agnlez Aug 6, 2024
6fb9488
WIP
agnlez Aug 6, 2024
a4a2cea
adds get events endpoint
alexeh Aug 6, 2024
ef1a0d8
modify event data for easier testing
alexeh Aug 6, 2024
f85b811
minimal testing flow for quality of life
alexeh Aug 6, 2024
2e819df
fetches events with API
agnlez Aug 6, 2024
58105c7
moves prefetching logic away from page generation
agnlez Aug 7, 2024
5d9e370
prefetches with service
agnlez Aug 7, 2024
f686726
contact-us anchor
agnlez Aug 7, 2024
cdf4225
add new data and types
alexeh Aug 7, 2024
90fbfd1
news endpoint
alexeh Aug 7, 2024
6163399
refactor events
alexeh Aug 7, 2024
294560b
add case studies endpoint
alexeh Aug 7, 2024
2fcc13b
update case study typing
alexeh Aug 7, 2024
f7839c1
fixes export
agnlez Aug 7, 2024
6a08635
adds news pagination
agnlez Aug 7, 2024
2c1ad29
Merge pull request #6 from Vizzuality/feature/events-page
agnlez Aug 7, 2024
42e2629
homepage: social media in header
agnlez Aug 7, 2024
6d0e973
fixes type
agnlez Aug 7, 2024
8f1ab5e
WIP
agnlez Aug 7, 2024
0cbb0a0
WIP
agnlez Aug 7, 2024
c2582bd
add turbopack bundling for dev
alexeh Aug 8, 2024
0ec5d67
Merge pull request #8 from Vizzuality/chore/improve-dev-compilation-time
alexeh Aug 8, 2024
b62c483
cases page layout
agnlez Aug 8, 2024
29dab3b
Merge pull request #9 from Vizzuality/feature/cases-page
agnlez Aug 8, 2024
076c8b9
case studies filters
agnlez Aug 8, 2024
cbf752e
Merge pull request #10 from Vizzuality/feature/case-studies-filters
agnlez Aug 12, 2024
7e27010
add case-study query key
alexeh Aug 10, 2024
93c735f
notes and refactor
alexeh Aug 10, 2024
05cd334
prefetch case studies with queryClient
alexeh Aug 10, 2024
dd95b93
add case studies container
alexeh Aug 10, 2024
6d245f0
get data and paint case studies
alexeh Aug 10, 2024
32ebe36
Add atom for total case studies
alexeh Aug 10, 2024
bb1519f
WIP
alexeh Aug 12, 2024
f49be78
get total case studies
alexeh Aug 12, 2024
e8e43da
List case studies
alexeh Aug 12, 2024
7370ef8
remove pagination, get all case studies
alexeh Aug 12, 2024
85351c8
remove query key for total case studies
alexeh Aug 12, 2024
ff3f54d
stronger typing
alexeh Aug 13, 2024
a78bb5d
add query-string to build api query
alexeh Aug 13, 2024
c9af298
refactor filter query
alexeh Aug 13, 2024
761dd11
add tests for array filterins
alexeh Aug 13, 2024
4e7a4f6
remove nextjs build complains
alexeh Aug 13, 2024
91b03bd
add CI build step
alexeh Aug 13, 2024
ee8056a
Merge pull request #12 from Vizzuality/feat/case-studies-list
agnlez Aug 14, 2024
a19c4fd
adds cluster layer
agnlez Aug 12, 2024
4610c36
removes turf-point
agnlez Aug 19, 2024
bb2e317
updates study cases tests
agnlez Aug 19, 2024
5619732
Merge pull request #13 from Vizzuality/feature/cluster-layer
agnlez Aug 19, 2024
969ef2e
fixes on search
agnlez Aug 19, 2024
cabd67c
adds placeholder data on search
agnlez Aug 19, 2024
234550e
fixes jotai atoms duplicity
agnlez Aug 19, 2024
8445dbf
changes naming of sidebar state
agnlez Aug 19, 2024
9cf7a35
improved styling of study case list
agnlez Aug 19, 2024
cf873f5
mailchimp integration
agnlez Aug 20, 2024
7af79c3
contact-us anchor
agnlez Aug 20, 2024
5cbe549
WIP
agnlez Aug 20, 2024
86d8770
study case sidebar detail
agnlez Aug 21, 2024
3dbe070
Merge pull request #14
agnlez Aug 21, 2024
72c051d
adds map legend
agnlez Aug 21, 2024
dfb1ba8
no-shrink with long titles
agnlez Aug 21, 2024
f75f595
updates content for study cases and events
agnlez Aug 21, 2024
800063d
Merge pull request #15 from Vizzuality/study-case-model-updates
agnlez Aug 22, 2024
0a911ff
clears global filters when clear filters
agnlez Aug 22, 2024
22761dd
persists study cases while filtering
agnlez Aug 22, 2024
aec3530
fixes logo size
agnlez Aug 22, 2024
dad35eb
Merge pull request #16 from Vizzuality/fix/logo
agnlez Aug 22, 2024
aea619a
adds new fields to event dialog
agnlez Aug 23, 2024
1078cda
lowercase more4nature
agnlez Aug 26, 2024
2a08915
newsletter: updates subscribing sentence
agnlez Aug 26, 2024
1c088c2
WIP
agnlez Aug 26, 2024
088fb7f
Merge pull request #17 from Vizzuality/responsive/cases
agnlez Aug 28, 2024
27eac70
restores m4n goals image
agnlez Aug 29, 2024
339690a
more responsive
agnlez Aug 29, 2024
d3ef5ab
fixes video gradient
agnlez Aug 29, 2024
ac2d3b7
updates news content
agnlez Aug 29, 2024
a996d4b
implements loader while fetching cases
agnlez Aug 29, 2024
c3344fe
wip
agnlez Aug 29, 2024
266e6a3
flex-wrap for news categories
agnlez Aug 30, 2024
aa7ffbe
contact-us now points to footer
agnlez Aug 30, 2024
76d3c6d
fixes height of image in about page
agnlez Aug 30, 2024
66203bc
map fit bounds when case is accessed
agnlez Aug 30, 2024
58f2a6d
adjusts styles for mobile dialog
agnlez Sep 2, 2024
73eb624
updates work packages descriptions
agnlez Sep 2, 2024
e61d165
mobile: adds button in partners list
agnlez Sep 2, 2024
28f7779
responsive events/news carousel
agnlez Sep 2, 2024
40c8263
responsive application menu
agnlez Sep 2, 2024
ba1fbde
mobile filters cases now closes clicking outside
agnlez Sep 3, 2024
c82d048
responsive cases search
agnlez Sep 3, 2024
0b76ecb
closes menu app menu on click section
agnlez Sep 3, 2024
bf8c3bb
app logos: import images without defining sizes
agnlez Sep 3, 2024
6a09ef3
updates news tests
agnlez Sep 3, 2024
ee55a34
updated meta tags
agnlez Sep 3, 2024
5438f38
updates app menu styles
agnlez Sep 3, 2024
4e59734
adds social media images
agnlez Sep 3, 2024
1623466
removes unnecessary todos
agnlez Sep 3, 2024
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
1 change: 1 addition & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MAILCHIMP_API_KEY=
105 changes: 105 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
module.exports = {
extends: [
'next/core-web-vitals',
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
],
plugins: ['prettier'],
rules: {
'@typescript-eslint/no-unused-vars': ['warn', { ignoreRestSiblings: true }],
'import/order': [
'warn',
{
groups: ['builtin', 'external', 'internal', 'parent', 'sibling'],
'newlines-between': 'always',
alphabetize: {
order: 'asc',
caseInsensitive: true,
},
pathGroups: [
{
pattern: 'react',
group: 'builtin',
position: 'before',
},
{
pattern: 'react**',
group: 'builtin',
},
{
pattern: '@react**',
group: 'builtin',
},
{
pattern: 'next/**',
group: 'builtin',
position: 'after',
},
{
pattern: '@/env.mjs',
group: 'internal',
position: 'before',
},
{
pattern: '@/lib/**',
group: 'internal',
position: 'before',
},
{
pattern: '@/data/**',
group: 'internal',
position: 'before',
},
{
pattern: '@/store',
group: 'internal',
position: 'before',
},
{
pattern: '@/store/**',
group: 'internal',
position: 'before',
},
{
pattern: '@/types/**',
group: 'internal',
position: 'before',
},
{
pattern: '@/app/**',
group: 'internal',
position: 'before',
},
{
pattern: '@/hooks/**',
group: 'internal',
position: 'before',
},
{
pattern: '@/constants/**',
group: 'internal',
position: 'before',
},
{
pattern: '@/containers/**',
group: 'internal',
position: 'before',
},
{
pattern: '@/components/**',
group: 'internal',
},
{
pattern: '@/services/**',
group: 'internal',
position: 'after',
},
],
pathGroupsExcludedImportTypes: ['react'],
},
],
'no-console': ['warn'],
'no-debugger': ['warn'],
},
ignorePatterns: ['*.md'],
};
13 changes: 13 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
### Overview

_Please write a description. If the PR is hard to understand, provide a quick explanation of the code._

Task: [Link to the task in the task manager]

### Testing instructions

_Please explain how to test the PR: ID of a dataset, steps to reach the feature, etc._
### Designs


_Link to the related design prototypes (if applicable)_
29 changes: 29 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Build and Test

on:
push:

jobs:
build-and-test:
name: Build and Test
runs-on: ubuntu-22.04

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Node setup
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'

- uses: pnpm/action-setup@v4

- name: Install deps
run: pnpm install

- name: Build
run: pnpm build

- name: Run Client tests
run: pnpm test
36 changes: 36 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js
.yarn/install-state.gz

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# local env files
.env*.local

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
save-prefix=''
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v22.2.0
10 changes: 10 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/** @type {import("prettier").Options} */
export default {
semi: true,
tabWidth: 2,
printWidth: 100,
singleQuote: true,
trailingComma: 'all',
editorconfig: true,
plugins: ['prettier-plugin-tailwindcss'],
};
13 changes: 13 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM node:22.2.0-alpine

WORKDIR /app

COPY . .

RUN corepack enable pnpm
RUN pnpm install
RUN pnpm build

EXPOSE 3000

CMD ["pnpm", "start"]
21 changes: 0 additions & 21 deletions LICENSE

This file was deleted.

37 changes: 36 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,36 @@
# more4nature
This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).

## Getting Started

First, run the development server:

```bash
npm run dev
# or
yarn dev
# or
pnpm dev
# or
bun dev
```

Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.

This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.

## Learn More

To learn more about Next.js, take a look at the following resources:

- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.

You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!

## Deploy on Vercel

The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.

Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
17 changes: 17 additions & 0 deletions components.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "default",
"rsc": true,
"tsx": true,
"tailwind": {
"config": "tailwind.config.ts",
"css": "src/app/globals.css",
"baseColor": "slate",
"cssVariables": true,
"prefix": ""
},
"aliases": {
"components": "@/components",
"utils": "@/lib/utils"
}
}
6 changes: 6 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
services:
client:
build:
context: .
ports:
- "3000:3000"
14 changes: 14 additions & 0 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
const config = {
testEnvironment: 'node',
transform: {
'^.+\\.(ts|tsx)$': 'ts-jest',
},
moduleNameMapper: {
'^@/(.*)$': '<rootDir>/src/$1',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
testMatch: ['<rootDir>/tests/**/*.test.(ts|tsx)'],
testPathIgnorePatterns: ['/node_modules/', '/.next/'],
};

export default config;
4 changes: 4 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/** @type {import('next').NextConfig} */
const nextConfig = {};

export default nextConfig;
Loading