Skip to content

Commit a6657de

Browse files
committed
Merge branch 'main' of github.com:UW-Macrostrat/rockd-website
2 parents 88c1fc2 + 988d33c commit a6657de

File tree

102 files changed

+137
-5252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+137
-5252
lines changed

.babel-rc

Lines changed: 0 additions & 3 deletions
This file was deleted.

.npmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

README.md

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,15 @@
33
This is the code for Version 2 of Rockd's website, which replaced the large repository of flat HTML, CSS, some JS and images.
44
It is a collection of TS files and references to an S3 bucket holding images.
55

6-
The new website also contains an uopdated version of [trips viewer](https://github.com/UW-Macrostrat/rockd-trips) that shows maps for all trips.
6+
The new website also contains an updated version of [trips viewer](https://github.com/UW-Macrostrat/rockd-trips) that shows maps for all trips.
77

88
## Installation for local development
99

1010
1. Clone the repository
1111
2. Create and populate a `.env` file with the appropriate environment variables (See [
12-
`.env.example`](https://github.com/UW-Macrostrat/web/blob/main/.env.example) for more information.)
13-
3. Run `make` to pull down submodules and update packages
14-
4. Verify that you have access to recent versions of Node.js and the Yarn package manager ( `node >= 16.0.0` and
12+
`.env.example`](https://github.com/UW-Macrostrat/rockd-website/blob/main/.env.example) for more information.)
13+
3. Verify that you have access to recent versions of Node.js and the Yarn package manager ( `node >= 16.0.0` and
1514
`yarn >= 4.0.0`; run `node -v` and `yarn -v` to check)
16-
5. Run `yarn install` to update packages
17-
6. Start the live-reloading development server with `yarn run dev`. The server will be available at
18-
`http://localhost:3000` by default.
19-
20-
ALTERNATIVELY
21-
22-
1. Clone the repository
23-
2. Pull down submodules (`git submodule update --init --recursive`)
24-
3. Create and populate a `.env` file with the appropriate environment variables (See [
25-
`.env.example`](https://github.com/UW-Macrostrat/web/blob/main/.env.example) for more information.)
26-
4. Verify that you have access to recent versions of Node.js and the Yarn package manager ( `node >= 16.0.0` and
27-
`yarn >= 4.0.0`; run `node -v` and `yarn -v` to check)
28-
5. Run `yarn install` to update packages
29-
6. Start the live-reloading development server with `yarn run dev`. The server will be available at
15+
4. Run `make` (or `git submodule update --init --recursive` and `yarn install`) to pull down submodules and update packages
16+
5. Start the live-reloading development server with `yarn run dev`. The server will be available at
3017
`http://localhost:3000` by default.

a/assets/css/MarkerCluster.Default.css

Lines changed: 0 additions & 60 deletions
This file was deleted.

a/assets/css/MarkerCluster.css

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)