User:Sevgi/Grad Notes - Revision history

Sevgi: /* Gitpub workshop with Kim */

2026-06-08T11:55:30Z

Gitpub workshop with Kim

← Older revision		Revision as of 13:55, 8 June 2026
Line 893:		Line 893:
	---		---

	looked into invitation ~~wit~~ zuhui and feline using gitea website instead of command line tools		looked into invitation with zuhui and feline using gitea website instead of command line tools

2026-05-04T11:11:35Z

Gitpub workshop with Kim

← Older revision		Revision as of 13:11, 4 May 2026
Line 877:		Line 877:
	\|		\|
	</syntaxhighlight>etherpad handles merge conflict -> with an operational transformation algorithm		</syntaxhighlight>etherpad handles merge conflict -> with an operational transformation algorithm

			merge strategies of git: https://git-scm.com/docs/merge-strategies includes strategies like 'patience' , 'octopus', 'ours, 'theirs'... v interesting stuff
	----git pull -> update git		----git pull -> update git

2026-05-04T11:04:55Z

Gitpub workshop with Kim

← Older revision		Revision as of 13:04, 4 May 2026
Line 888:		Line 888:

	git slowerdowner -> gitpub		git slowerdowner -> gitpub

			---

			looked into invitation wit zuhui and feline using gitea website instead of command line tools

2026-05-04T09:30:35Z

Gitpub workshop with Kim

← Older revision		Revision as of 11:30, 4 May 2026
Line 884:		Line 884:

	git push -> update remote		git push -> update remote

			git log- > shows all the metadata and commit msgs etc. with the Short hash codes...

			git slowerdowner -> gitpub

2026-05-04T09:20:16Z

Gitpub workshop with Kim

← Older revision		Revision as of 11:20, 4 May 2026
Line 876:		Line 876:
	\ /		\ /
	\|		\|
	</syntaxhighlight>		</syntaxhighlight>etherpad handles merge conflict -> with an operational transformation algorithm
			----git pull -> update git

			git add-> add your changes

			git commit -am "something" -> record changes

			git push -> update remote

2026-05-04T09:12:12Z

sending requests and appending them

← Older revision		Revision as of 11:12, 4 May 2026
Line 866:		Line 866:
	</html>		</html>
	</syntaxhighlight>moved to: [[User:Sevgi/Grad Notes/Flask\|Flask]]		</syntaxhighlight>moved to: [[User:Sevgi/Grad Notes/Flask\|Flask]]

			== Gitpub workshop with Kim ==
			diverge x converge<syntaxhighlight lang="bash">
			\|
			/ \
			\| \|
			\| \|
			\| \|
			\ /
			\|
			</syntaxhighlight>

2026-04-07T10:19:46Z

Flask Day

← Older revision		Revision as of 12:19, 7 April 2026
Line 865:		Line 865:

	</html>		</html>
	</syntaxhighlight>		</syntaxhighlight>moved to: [[User:Sevgi/Grad Notes/Flask\|Flask]]

2026-04-07T10:01:25Z

sending requests and appending them

← Older revision		Revision as of 12:01, 7 April 2026
Line 840:		Line 840:

	https://caddyserver.com/ is simpler.		https://caddyserver.com/ is simpler.

			and the observations.html looks like this:<syntaxhighlight lang="python3">
			<!DOCTYPE html>
			<html lang="en">

			<head>
			<meta charset="UTF-8">
			<meta name="viewport" content="width=device-width, initial-scale=1.0">
			<title>I spy...</title>
			</head>

			<body>
			<h1>👁️L👁️</h1>
			<!-- default templates in flask are jinja -->
			{%for observation in database %}
			<div> {{ observation }} </div>
			{% endfor %}
			<form method="POST">
			<textarea name="observation"></textarea>
			<input type="submit" value="Save" >
			</form>

			</body>

			</html>
			</syntaxhighlight>

2026-04-07T09:55:47Z

sending requests and appending them

← Older revision		Revision as of 11:55, 7 April 2026
Line 811:		Line 811:

	=== sending requests and appending them ===		=== sending requests and appending them ===
	[[File:Flask1.png\|~~left~~\|~~thumb~~]]		[[File:Flask1.png\|center\|frameless\|600x600px]]
	<syntaxhighlight lang="python3">		<syntaxhighlight lang="python3">
	from flask import Flask, render_template, request		from flask import Flask, render_template, request
Line 837:		Line 837:
	return render_template("observations.html", database=database)		return render_template("observations.html", database=database)
	#database=database is from jinja		#database=database is from jinja
	</syntaxhighlight>		</syntaxhighlight>luke says instead of nginx:

			https://caddyserver.com/ is simpler.

2026-04-07T09:33:37Z

GET , POST

← Older revision		Revision as of 11:33, 7 April 2026
Line 808:		Line 808:

	</html>		</html>
			</syntaxhighlight>

			=== sending requests and appending them ===
			[[File:Flask1.png\|left\|thumb]]
			<syntaxhighlight lang="python3">
			from flask import Flask, render_template, request
			app = Flask(__name__)

			database = []

			# if you name this file app then you dont have to --app to run. it

			#we will use GET and POST, http methods and web requests
			# POST are sent to the flask application
			# GET is getting the info from flask

			@app.route("/", methods=["GET","POST"])
			def main():
			if request.method == "POST":
			# we use the NAME we give to the textarea -> observation
			observation = request.form["observation"]
			database.append(observation)
			# return database
			# return observation

			# return "post!"

			return render_template("observations.html", database=database)
			#database=database is from jinja
	</syntaxhighlight>		</syntaxhighlight>